Reworks Curtains #28163
Open
Reworks Curtains #28163
+143
−27
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ParadiseSS13-Bot
added
-Status: Awaiting type assignment
|
The resprite could probably be a separate PR, or at the very least mentioned in the PR description. |
Fordoxia
reviewed
Jan 28, 2025
Fordoxia
reviewed
Jan 28, 2025
ParadiseSS13-Bot
added
-Status: Awaiting approval
Co-authored-by: CRUNCH <[email protected]> Signed-off-by: Tojo <[email protected]>
ParadiseSS13-Bot
added
-Status: Awaiting review
|
New sprites and overlay code. |
Fordoxia
reviewed
Jan 31, 2025
|
WOOOOOOOOO TIME TO MIGRATE THE ENTIRETY OF ITEM/MOUNTED TO THE NEW ATTACKCHAIN |
Burzah
requested changes
Feb 10, 2025
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Co-authored-by: Burzah <[email protected]> Signed-off-by: Tojo <[email protected]>
Burzah
approved these changes
Feb 10, 2025
ParadiseSS13-Bot
added
-Status: Awaiting merge
lewcc
reviewed
Feb 12, 2025
|
|
||
| /obj/item/mounted/curtain/curtain_fixture/interact_with_atom(atom/target, mob/living/user, list/modifiers) | ||
| . = ..() | ||
| if(!istype(target,/obj/structure/window) && !istype(target,/turf/simulated/wall/)) |
There was a problem hiding this comment.
Suggested change
| if(!istype(target,/obj/structure/window) && !istype(target,/turf/simulated/wall/)) | |
| if(!istype(target ,/obj/structure/window) && !istype(target, /turf/simulated/wall/)) |
| if(!istype(target,/obj/structure/window) && !istype(target,/turf/simulated/wall/)) | ||
| return | ||
| var/on_wall = get_turf(target) | ||
| to_chat(user, "<span class='notice'>You begin attaching [src] to the [on_wall].</span>") |
There was a problem hiding this comment.
Suggested change
| to_chat(user, "<span class='notice'>You begin attaching [src] to the [on_wall].</span>") | |
| to_chat(user, "<span class='notice'>You begin attaching [src] to [on_wall].</span>") |
Comment on lines
+61
to
+62
| user.visible_message("<span class='notice'>[user] attaches the [src] to the [on_wall].</span>", \ | ||
| "<span class='notice'>You attach the [src] to the [on_wall].</span>") |
There was a problem hiding this comment.
Suggested change
| user.visible_message("<span class='notice'>[user] attaches the [src] to the [on_wall].</span>", \ | |
| "<span class='notice'>You attach the [src] to the [on_wall].</span>") | |
| user.visible_message("<span class='notice'>[user] attaches the [src] to [on_wall].</span>", \ | |
| "<span class='notice'>You attach the [src] to [on_wall].</span>") |
| return | ||
| if(!Adjacent(user)) | ||
| return | ||
| // TODO: turn back into assembly item |
There was a problem hiding this comment.
TODO here, planning on doing it in this PR?
| . += "<span class='notice'>Alt-Click to take it down.</span>" | ||
|
|
||
| /obj/structure/curtain/assembly/AltClick(mob/user) | ||
| if(user.incapacitated()) |
There was a problem hiding this comment.
Suggested change
| if(user.incapacitated()) | |
| if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) |
Comment on lines
142
to
155
| if(opacity) | ||
| icon_state = "closed" | ||
| overlay = image("closed_overlay") | ||
| overlay.color = overlay_color | ||
| overlay.alpha = overlay_alpha | ||
| add_overlay(overlay) | ||
| layer = SHOWER_CLOSED_LAYER | ||
| else | ||
| icon_state = "open" | ||
| overlay = image("open_overlay") | ||
| overlay.color = overlay_color | ||
| overlay.alpha = overlay_alpha | ||
| add_overlay(overlay) | ||
| layer = SHOWER_OPEN_LAYER |
There was a problem hiding this comment.
Could you move these to an update_overlays() call (and similar procs for the other things) and use the update_appearance() framework? I see this is duplicated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This PR Do
Reworks curtains. Makes Curtains a craftable fixture, like light tubes. Craft with Iron Rod, can put on walls, windows, or use in your hand to put it where you're standing on the ceiling. Apply cloth to turn into normal curtain. Use wirecutters to revert to assembly. Alt click assembly to turn into fixture item.
Additionally Resprites them.
Why It's Good For The Game
Eases the placement of curtains, removes them from the realm of the crafting menu. No more deconstructing the window to put up a curtain.
Images of changes
2025-01-28.02-12-06_edit.mp4
Testing
Did all of the interactions, works. I also made it compatible with borgs. You're welcome, Crunch.
Declaration
Changelog
🆑
tweak: Reworks Curtains
/:cl: